diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/StatusFragment.kt b/app/src/main/kotlin/io/treehouses/remote/Fragments/StatusFragment.kt
index 939f647b7..4fb029fa8 100644
--- a/app/src/main/kotlin/io/treehouses/remote/Fragments/StatusFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/Fragments/StatusFragment.kt
@@ -158,11 +158,11 @@ class StatusFragment : BaseFragment() {
 
     private fun checkUpgradeStatus(readMessage: String) {
         checkUpgradeNow()
-        if (readMessage.startsWith("false ") && readMessage.length < 14) {
+        if (readMessage.startsWith("false") && readMessage.length < 14) {
             bind.upgradeCheck.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.tick))
             bind.tvUpgradeCheck.text = String.format("Latest Version: %s", rpiVersion)
             bind.upgrade.visibility = View.GONE
-        } else if (readMessage.startsWith("true ") && readMessage.length < 14) {
+        } else if (readMessage.startsWith("true") && readMessage.length < 14) {
             bind.upgradeCheck.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.tick_png))
             bind.tvUpgradeCheck.text = String.format("Upgrade available from %s to %s", rpiVersion, readMessage.substring(4))
             bind.upgrade.visibility = View.VISIBLE
diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/BaseFragment.kt b/app/src/main/kotlin/io/treehouses/remote/bases/BaseFragment.kt
index f69e72152..a9dbc5f35 100644
--- a/app/src/main/kotlin/io/treehouses/remote/bases/BaseFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/bases/BaseFragment.kt
@@ -30,6 +30,11 @@ open class BaseFragment : Fragment() {
         return this::mChatService.isInitialized
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        if (listener.getChatService().state == Constants.STATE_CONNECTED) listener.sendMessage("killall\n")
+    }
+
 
     protected fun onLoad(mHandler: Handler?) {
         mChatService = listener.getChatService()