diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java
index 4a272e22e7..588aeec7b6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java
@@ -229,6 +229,16 @@ public class ConfigBuilderFragment extends Fragment implements FragmentBase {
                 }
             }
 
+            // Disable profile control for pump profiles if pump is not enabled
+            if (type == PluginBase.PROFILE) {
+                if (PumpInterface.class.isAssignableFrom(plugin.getClass())) {
+                    if (!plugin.isEnabled(PluginBase.PUMP)) {
+                        holder.checkboxEnabled.setEnabled(false);
+                        holder.checkboxEnabled.setChecked(false);
+                    }
+                }
+            }
+
             return convertView;
 
         }