diff --git a/server/src/com/cloud/network/ovs/OvsNetworkManagerImpl.java b/server/src/com/cloud/network/ovs/OvsNetworkManagerImpl.java
index 399fbe0964b..070f14877da 100644
--- a/server/src/com/cloud/network/ovs/OvsNetworkManagerImpl.java
+++ b/server/src/com/cloud/network/ovs/OvsNetworkManagerImpl.java
@@ -110,11 +110,14 @@ public class OvsNetworkManagerImpl implements OvsNetworkManager {
 			throws ConfigurationException {
 		_name = name;
 		_isEnabled = Boolean.parseBoolean(_configDao.getValue(Config.OvsNetwork.key()));
-		_serverId = ((ManagementServer)ComponentLocator.getComponent(ManagementServer.Name)).getId();
-	    _executorPool = Executors.newScheduledThreadPool(10, new NamedThreadFactory("OVS"));
-	    _cleanupExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("OVS-Cleanup"));
-	    _ovsListener = new OvsListener(this, _workDao, _tunnelDao, _vlanMappingDao, _hostDao);
-	    _agentMgr.registerForHostEvents(_ovsListener, true, true, true);
+		
+		if (_isEnabled) {
+			_serverId = ((ManagementServer)ComponentLocator.getComponent(ManagementServer.Name)).getId();
+			_executorPool = Executors.newScheduledThreadPool(10, new NamedThreadFactory("OVS"));
+			_cleanupExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("OVS-Cleanup"));
+			_ovsListener = new OvsListener(this, _workDao, _tunnelDao, _vlanMappingDao, _hostDao);
+			_agentMgr.registerForHostEvents(_ovsListener, true, true, true);
+		}
 		
 		return true;
 	}