diff --git a/app/streaming/session.cpp b/app/streaming/session.cpp
index 185b8c9f..6ef8a1b6 100644
--- a/app/streaming/session.cpp
+++ b/app/streaming/session.cpp
@@ -73,8 +73,11 @@ void Session::clStageFailed(int stage, long errorCode)
 
 void Session::clConnectionTerminated(long errorCode)
 {
-    s_ActiveSession->m_UnexpectedTermination = true;
-    emit s_ActiveSession->displayLaunchError("Connection terminated");
+    // Display the termination dialog if this was not intended
+    if (errorCode != 0) {
+        s_ActiveSession->m_UnexpectedTermination = true;
+        emit s_ActiveSession->displayLaunchError("Connection terminated");
+    }
 
     SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                  "Connection terminated: %ld",
diff --git a/moonlight-common-c/moonlight-common-c b/moonlight-common-c/moonlight-common-c
index dc21e28e..eb6bfe02 160000
--- a/moonlight-common-c/moonlight-common-c
+++ b/moonlight-common-c/moonlight-common-c
@@ -1 +1 @@
-Subproject commit dc21e28e1fa29202977344cea2bd86a3fba755c6
+Subproject commit eb6bfe020538d57ec2781c65f450409f32e56515