diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js
index fcb226c7c48..dc85b520b4d 100644
--- a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js
+++ b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js
@@ -27,9 +27,7 @@ package com.facebook.react.viewmanagers;
 
 public class ::_CLASSNAME_::<T extends ::_EXTEND_CLASSES_::> {
   public void setProperty(::_INTERFACE_CLASSNAME_::<T> viewManager, T view, String propName, Object value) {
-    switch (propName) {
-      ::_PROP_CASES_::
-    }
+    ::_PROP_CASES_::
   }
 }
 `;
@@ -77,10 +75,10 @@ function generatePropCasesString(
   componentName: string,
 ) {
   if (component.props.length === 0) {
-    return '  // No props';
+    return '// No props';
   }
 
-  return component.props
+  const cases = component.props
     .map(prop => {
       return `case "${prop.name}":
         viewManager.set${toSafeJavaString(
@@ -89,6 +87,10 @@ function generatePropCasesString(
         break;`;
     })
     .join('\n' + '      ');
+
+  return `switch (propName) {
+      ${cases}
+    }`;
 }
 
 function getClassExtendString(component): string {
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaDelegate-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaDelegate-test.js.snap
index 3fefa8a3eca..74ad90cdb47 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaDelegate-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaDelegate-test.js.snap
@@ -91,9 +91,7 @@ import android.view.View;
 
 public class CommandNativeComponentDelegate<T extends View> {
   public void setProperty(CommandNativeComponentInterface<T> viewManager, T view, String propName, Object value) {
-    switch (propName) {
-        // No props
-    }
+    // No props
   }
 }
 ",
@@ -189,9 +187,7 @@ import android.view.View;
 
 public class InterfaceOnlyComponentDelegate<T extends View> {
   public void setProperty(InterfaceOnlyComponentInterface<T> viewManager, T view, String propName, Object value) {
-    switch (propName) {
-        // No props
-    }
+    // No props
   }
 }
 ",
@@ -339,9 +335,7 @@ import android.view.View;
 
 public class NoPropsNoEventsComponentDelegate<T extends View> {
   public void setProperty(NoPropsNoEventsComponentInterface<T> viewManager, T view, String propName, Object value) {
-    switch (propName) {
-        // No props
-    }
+    // No props
   }
 }
 ",