diff --git a/rw_core/core/device/manager.go b/rw_core/core/device/manager.go
index d12cee9..6f8d899 100755
--- a/rw_core/core/device/manager.go
+++ b/rw_core/core/device/manager.go
@@ -69,7 +69,7 @@
 		dbPath:                  dbPath,
 		dProxy:                  dbPath.Proxy("devices"),
 		adapterMgr:              adapterMgr,
-		defaultTimeout:          defaultCoreTimeout * time.Millisecond,
+		defaultTimeout:          defaultCoreTimeout,
 		deviceLoadingInProgress: make(map[string][]chan int),
 	}
 	deviceMgr.stateTransitions = NewTransitionMap(deviceMgr)