diff --git a/addOns/client/src/main/java/org/zaproxy/addon/client/ExtensionClientIntegration.java b/addOns/client/src/main/java/org/zaproxy/addon/client/ExtensionClientIntegration.java
index b45ae9d280..330cf0f2c3 100644
--- a/addOns/client/src/main/java/org/zaproxy/addon/client/ExtensionClientIntegration.java
+++ b/addOns/client/src/main/java/org/zaproxy/addon/client/ExtensionClientIntegration.java
@@ -183,7 +183,7 @@ public void hook(ExtensionHook extensionHook) {
             extensionHook.getHookView().addWorkPanel(getClientDetailsPanel());
             extensionHook.getHookView().addStatusPanel(getClientHistoryPanel());
 
-            if (Constant.isDevBuild()) {
+            if (Constant.isDevMode()) {
                 // Not for release .. yet ;)
                 extensionHook.getHookMenu().addToolsMenuItem(getMenuItemCustomScan());
                 extensionHook
@@ -754,7 +754,7 @@ public void resumeAllScans() {
     }
 
     private void addScanToUi(final ClientSpider scan) {
-        if (!Constant.isDevBuild()) {
+        if (!Constant.isDevMode()) {
             return;
         }
 
@@ -776,7 +776,7 @@ public void sessionAboutToChange(Session session) {
             spiderScanController.reset();
 
             if (hasView()) {
-                if (Constant.isDevBuild()) {
+                if (Constant.isDevMode()) {
                     getClientSpiderPanel().reset();
                 }
                 if (spiderDialog != null) {
@@ -787,14 +787,14 @@ public void sessionAboutToChange(Session session) {
 
         @Override
         public void sessionChanged(final Session session) {
-            if (hasView() && Constant.isDevBuild()) {
+            if (hasView() && Constant.isDevMode()) {
                 ThreadUtils.invokeAndWaitHandled(getClientSpiderPanel()::reset);
             }
         }
 
         @Override
         public void sessionScopeChanged(Session session) {
-            if (hasView() && Constant.isDevBuild()) {
+            if (hasView() && Constant.isDevMode()) {
                 getClientSpiderPanel().sessionScopeChanged(session);
             }
         }
@@ -806,7 +806,7 @@ public void sessionModeChanged(Mode mode) {
             }
 
             if (hasView()) {
-                if (Constant.isDevBuild()) {
+                if (Constant.isDevMode()) {
                     getClientSpiderPanel().sessionModeChanged(mode);
                 }
                 getMenuItemCustomScan().setEnabled(!Mode.safe.equals(mode));
diff --git a/addOns/client/src/main/java/org/zaproxy/addon/client/ui/PopupMenuClientAttack.java b/addOns/client/src/main/java/org/zaproxy/addon/client/ui/PopupMenuClientAttack.java
index 2ce87ecc49..adc3cfd3f0 100644
--- a/addOns/client/src/main/java/org/zaproxy/addon/client/ui/PopupMenuClientAttack.java
+++ b/addOns/client/src/main/java/org/zaproxy/addon/client/ui/PopupMenuClientAttack.java
@@ -43,7 +43,7 @@ public boolean isEnableForComponent(Component invoker) {
             JTree tree = (JTree) invoker;
             if (ClientMapPanel.CLIENT_TREE_NAME.equals(tree.getName())) {
                 removeAll();
-                if (Constant.isDevBuild()) {
+                if (Constant.isDevMode()) {
                     // Not for release .. yet ;)
                     add(new PopupClientSpider(clientMapPanel));
                     List<ClientNode> nodes = clientMapPanel.getSelectedNodes();