diff --git a/soundtrigger/2.4/cli/java/android/hardware/soundtrigger/V2_4/cli/SthalCli.java b/soundtrigger/2.4/cli/java/android/hardware/soundtrigger/V2_4/cli/SthalCli.java
index e6870aa..4931105 100644
--- a/soundtrigger/2.4/cli/java/android/hardware/soundtrigger/V2_4/cli/SthalCli.java
+++ b/soundtrigger/2.4/cli/java/android/hardware/soundtrigger/V2_4/cli/SthalCli.java
@@ -61,7 +61,7 @@
             mService.registerAsService("mock");
 
             System.out.println("Rebooting STHAL");
-            SystemProperties.set("debug.soundtrigger_middleware.use_mock_hal", "true");
+            SystemProperties.set("debug.soundtrigger_middleware.use_mock_hal", "2");
             SystemProperties.set("sys.audio.restart.hal", "1");
 
             while (processCommand()) ;
@@ -74,7 +74,7 @@
 
     private static void cleanup() {
         System.out.println("Cleaning up.");
-        SystemProperties.set("debug.soundtrigger_middleware.use_mock_hal", "false");
+        SystemProperties.set("debug.soundtrigger_middleware.use_mock_hal", null);
         HwBinder.setTrebleTestingOverride(false);
     }