diff --git a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m
index 09617d4..bc0cbae 100644
--- a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m
+++ b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m
@@ -293,7 +293,7 @@
 - (nullable NSURLSessionTask *)sendRequest:(nonnull MVMCoreRequestParameters *)requestParameters locationForError:(nonnull NSString *)locationForError requestFinished:(nullable void (^)(id _Nullable jsonObject, MVMCoreErrorObject *_Nullable error))requestFinished {
 
 #if ENABLE_HARD_CODED_RESPONSE
-    NSDictionary *response = [[MFHardCodedServerResponse new] getHardCodedResponseForPageType:requestParameters.pageType];
+    NSDictionary *response = [[MFHardCodedServerResponse new] getHardCodedResponseForRequest:requestParameters];
     if (response) {
         if (requestFinished) {
             requestFinished(response, nil);
diff --git a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.m b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.m
index 0319f4e..e32ec74 100644
--- a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.m
+++ b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.m
@@ -97,6 +97,11 @@
         }
     }
     
+    if (!cannedResponse) {
+        cannedResponse = [self getHardCodedResponseForPageType:request.pageType];
+    }
+    
+    
     return cannedResponse;
 }