diff --git a/src/src/com/tns/JsDebugger.java b/src/src/com/tns/JsDebugger.java
index 15926330f..c8d630e8c 100644
--- a/src/src/com/tns/JsDebugger.java
+++ b/src/src/com/tns/JsDebugger.java
@@ -59,6 +59,8 @@ public class JsDebugger
 	private byte[] LINE_END_BYTES;
 
 	private HandlerThread handlerThread;
+
+	public boolean jsDebuggerEnabled;
 	
 	public JsDebugger(Context context, Logger logger, ThreadScheduler threadScheduler)
 	{
@@ -124,7 +126,12 @@ public void close() throws IOException
 	                	try
 	    				{
 	                		LocalSocket socket = serverSocket.accept();
-
+	                		
+	                		if (!jsDebuggerEnabled)
+	                		{
+	                			enable();
+	                		}
+	                		
 	                		logger.write("NativeScript Debugger new connection on: " + socket.getFileDescriptor().toString());
 	                		
 	    					//out (send messages to node inspector)
@@ -492,6 +499,7 @@ private void enableAgent()
 	{
 		logger.write("Enabling NativeScript Debugger Agent");
 		enable();
+		jsDebuggerEnabled = true;
 	}
 
 	@RuntimeCallable
@@ -500,7 +508,6 @@ private void disableAgent()
 		logger.write("Disabling NativeScript Debugger Agent");
 		disable();
 		
-		
 		String message = "{\"seq\":0,\"type\":\"request\",\"command\":\"disconnect\"}";
 		
 		byte[] cmdBytes;
@@ -580,12 +587,13 @@ public void start()
 		
 		registerEnableDisableDebuggerReceiver(handler);
 		
-		logger.write("Enabling Debugger Agent");
-		enable();
-
 		boolean shouldDebugBreak = getDebugBreakFlagAndClearIt();
 		if (shouldDebugBreak)
 		{
+			logger.write("Enabling Debugger Agent");
+			enable();
+			jsDebuggerEnabled = true;
+			
 			debugBreak();
 		}
 	}