diff --git a/tizenbrew-app/TizenBrew/index.html b/tizenbrew-app/TizenBrew/index.html
index 4560014..7affbe9 100644
--- a/tizenbrew-app/TizenBrew/index.html
+++ b/tizenbrew-app/TizenBrew/index.html
@@ -121,7 +121,7 @@
                             break;
                         }
 
-                        window.send({ type: "launch", package: `${moduleType}/${packageName}`, tvIp: webapis.network.getIp() });
+                        window.send({ type: "launch", package: `${moduleType}/${packageName}`, tvIp: webapis.network.getIp(), isTizen3 });
                         var keys = selectedItem.getAttribute("data-keys");
                         if (appPath.startsWith("http")) {
                             if (keys.length > 0) {
diff --git a/tizenbrew-app/TizenBrew/js/wsClient.js b/tizenbrew-app/TizenBrew/js/wsClient.js
index d01a372..c65627d 100644
--- a/tizenbrew-app/TizenBrew/js/wsClient.js
+++ b/tizenbrew-app/TizenBrew/js/wsClient.js
@@ -122,7 +122,7 @@ function onMessage(msg) {
                 }
 
                 setTimeout(() => {
-                    send({ type: 'launch', package: `${moduleType}/${moduleName}`, tvIp: webapis.network.getIp() });
+                    send({ type: 'launch', package: `${moduleType}/${moduleName}`, tvIp: webapis.network.getIp(), isTizen3 });
                     if (!tizenAppId) {
                         location.href = `${appPath}${args ? `?${args}` : ''}`;
                     }
diff --git a/tizenbrew-app/TizenBrew/service/debugger.js b/tizenbrew-app/TizenBrew/service/debugger.js
index a556473..578ac41 100644
--- a/tizenbrew-app/TizenBrew/service/debugger.js
+++ b/tizenbrew-app/TizenBrew/service/debugger.js
@@ -20,7 +20,7 @@ function startDebugging(port, adb_conn, ip) {
                 return attachDebugger(debuggerJson[0].webSocketDebuggerUrl, adb_conn);
             }).catch(
                 e => {
-                    if (attempts >= 5) {
+                    if (attempts >= 10) {
                         global.currentClient.send(JSON.stringify({ type: 'error', message: 'Failed to connect to debugger.' }));
                         clearInterval(connectionInterval);
                         global.inDebug.tizenDebug = false;
diff --git a/tizenbrew-app/TizenBrew/service/service.js b/tizenbrew-app/TizenBrew/service/service.js
index 5d72e95..913b912 100644
--- a/tizenbrew-app/TizenBrew/service/service.js
+++ b/tizenbrew-app/TizenBrew/service/service.js
@@ -134,8 +134,7 @@ module.exports.onStart = function () {
                 }
                 case 'relaunchInDebug': {
                     setTimeout(() => {
-                        const isTizen3 = tizen.systeminfo.getCapability('http://tizen.org/feature/platform.version').split('.')[0] === '3';
-                        createAdbConnection(isTizen3, message.tvIp);
+                        createAdbConnection(message.isTizen3, message.tvIp);
                     }, 1000);
                     break;
                 }
@@ -172,9 +171,7 @@ module.exports.onStart = function () {
                             }
 
                             if (module.tizenAppId) {
-                                const isTizen3 = tizen.systeminfo.getCapability('http://tizen.org/feature/platform.version').split('.')[0] === '3';
-                                // TODO: Get TV IP from os.networkInterfaces()
-                                createAdbConnection(isTizen3, message.tvIp, module.tizenAppId);
+                                createAdbConnection(message.isTizen3, message.tvIp, module.tizenAppId);
                             }
                         } else {
                             global.currentModule = {