diff --git a/vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
index e3aebe8594..9dcf6d0922 100644
--- a/vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
@@ -188,7 +188,6 @@ class NewHomeDetailFragment :
         super.onResume()
         callManager.checkForProtocolsSupportIfNeeded()
         refreshSpaceState()
-        refreshDebugButtonState()
     }
 
     private fun refreshSpaceState() {
@@ -305,14 +304,10 @@ class NewHomeDetailFragment :
         }
 
         views.appBarLayout.addOnOffsetChangedListener(AppBarLayout.OnOffsetChangedListener { _, verticalOffset ->
-            views.debugButton.isVisible = verticalOffset == 0
+            views.debugButton.isVisible = verticalOffset == 0 && buildMeta.isDebug && vectorPreferences.developerMode()
         })
     }
 
-    private fun refreshDebugButtonState() {
-        views.debugButton.isVisible = buildMeta.isDebug && vectorPreferences.developerMode()
-    }
-
     /* ==========================================================================================
      * KeysBackupBanner Listener
      * ========================================================================================== */