diff --git a/www/js/services/device-services.js b/www/js/services/device-services.js
index 89a06cc027094ddf26ef3e58092bf60168c6745b..14a5fe84af9eed8dca2f89d3c18dd29119df44ff 100644
--- a/www/js/services/device-services.js
+++ b/www/js/services/device-services.js
@@ -2,7 +2,7 @@ var App;
 
 angular.module('cesium.device.services', ['cesium.utils.services', 'cesium.settings.services'])
 
-  .factory('Device', function($rootScope, $translate, $ionicPopup, $q, Api,
+  .factory('Device', function($rootScope, $translate, $ionicPopup, $q, Api, csConfig,
       // removeIf(no-device)
       $cordovaClipboard, $cordovaBarcodeScanner, $cordovaCamera, $cordovaNetwork,
       // endRemoveIf(no-device)
@@ -209,7 +209,7 @@ angular.module('cesium.device.services', ['cesium.utils.services', 'cesium.setti
                 timeout = defaultTimeout;
                 break;
             }
-            console.debug('[network] Using timeout: {1}ms (connection type: \'{0}\')'.format(connectionType, timeout));
+            console.debug('[device] Using timeout: {1}ms (connection type: \'{0}\')'.format(connectionType, timeout));
 
             return timeout;
           } catch(err) {
diff --git a/www/js/services/network-services.js b/www/js/services/network-services.js
index 5c387303290108a8e06c2689635e24c145a8188d..28f62358aa65343aea26d8486743ca8dbff17bbd 100644
--- a/www/js/services/network-services.js
+++ b/www/js/services/network-services.js
@@ -106,7 +106,7 @@ angular.module('cesium.network.services', ['ngApi', 'cesium.currency.services',
      }
 
      // Computing timeout from the connection type
-     return Device.network.timeout(csConfig.timeout);
+     return Device.network.timeout();
     },
 
     hasPeers = function() {