diff --git a/app/common/services/apiInterceptor.js b/app/common/services/apiInterceptor.js
index 3e72cc6..de344cd 100644
--- a/app/common/services/apiInterceptor.js
+++ b/app/common/services/apiInterceptor.js
@@ -16,7 +16,10 @@
             return {
                 'request': function(config){
                     dataService.loading = true;
-                    config.timeout = 20000;
+                    // If caller has not defined a timeout, set to default of 20s
+                    if (config.timeout == null){
+                        config.timeout = 20000;
+                    }
                     return config;
                 },
                 'response': function(response){