diff --git a/res/values/strings.xml b/res/values/strings.xml
index b789907..a6d3ab7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -11745,6 +11745,8 @@
     <string name="dsu_loader_description" translatable="false">Load a Dynamic System Update Image</string>
     <!-- DSU Loader Loading. Do not translate. -->
     <string name="dsu_loader_loading" translatable="false">Loading...</string>
+    <!-- DSU Loader. Do not translate. -->
+    <string name="dsu_is_running" translatable="false">DSU is running</string>
 
     <!-- Name of dev option called "Bug report handler" [CHAR LIMIT=NONE] -->
     <string name="bug_report_handler_title">Bug report handler</string>
diff --git a/src/com/android/settings/development/SelectDSUPreferenceController.java b/src/com/android/settings/development/SelectDSUPreferenceController.java
index 72e8447..6498ae7 100644
--- a/src/com/android/settings/development/SelectDSUPreferenceController.java
+++ b/src/com/android/settings/development/SelectDSUPreferenceController.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.SystemProperties;
 
 import androidx.preference.Preference;
 
@@ -37,9 +38,16 @@
         return DSU_LOADER_KEY;
     }
 
+    private boolean isDSURunning() {
+        return SystemProperties.getBoolean("ro.gsid.image_running", false);
+    }
+
     @Override
     public boolean handlePreferenceTreeClick(Preference preference) {
         if (DSU_LOADER_KEY.equals(preference.getKey())) {
+            if (isDSURunning()) {
+                return true;
+            }
             final Intent intent = new Intent(mContext, DSULoader.class);
             mContext.startActivity(intent);
             return true;
@@ -49,6 +57,7 @@
 
     @Override
     public void updateState(Preference preference) {
-        preference.setSummary(mContext.getResources().getString(R.string.dsu_loader_description));
+        int key = isDSURunning() ? R.string.dsu_is_running : R.string.dsu_loader_description;
+        preference.setSummary(mContext.getResources().getString(key));
     }
 }
