diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 7ea77e2..e601407 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@
 
   // This field is accessed from release scripts using simple pattern matching.
   // Therefore, changing this field could break our release scripts.
-  public static final String LABEL = "1.5.60";
+  public static final String LABEL = "1.5.61";
 
   private Version() {
   }
diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index 7d3b26e..603d213 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -156,7 +156,8 @@
       !Version.isDev() || System.getProperty("com.android.tools.r8.disableinlining") == null;
   public boolean enableInliningOfInvokesWithNullableReceivers = true;
   public boolean enableClassInlining = true;
-  public boolean enableClassStaticizer = true;
+  // TODO(119626580): Turn on class staticizer when fixed.
+  public boolean enableClassStaticizer = false;
   public boolean enableInitializedClassesAnalysis = true;
   public boolean enableSideEffectAnalysis = true;
   public boolean enableServiceLoaderRewriting = true;
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/staticizer/ClassStaticizerTest.java b/src/test/java/com/android/tools/r8/ir/optimize/staticizer/ClassStaticizerTest.java
index a676b5d..4808ac0 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/staticizer/ClassStaticizerTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/staticizer/ClassStaticizerTest.java
@@ -315,6 +315,8 @@
   private void configure(InternalOptions options) {
     options.enableClassInlining = false;
     options.enableUninstantiatedTypeOptimization = false;
+    // TODO(119626580): Remove when resolved.
+    options.enableClassStaticizer = true;
   }
 
   @Test
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/classstaticizer/IfRuleWithClassStaticizerTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/classstaticizer/IfRuleWithClassStaticizerTest.java
index f5b1a29..fd870a2 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/classstaticizer/IfRuleWithClassStaticizerTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/classstaticizer/IfRuleWithClassStaticizerTest.java
@@ -57,6 +57,8 @@
                 "-keep class " + Unused.class.getTypeName())
             .enableInliningAnnotations()
             .enableClassInliningAnnotations()
+            // TODO(119626580): Remove when resolved.
+            .addOptionsModification(options -> options.enableClassStaticizer = true)
             .run(TestClass.class)
             .assertSuccessWithOutput(expectedOutput)
             .inspector();
