diff --git a/data/inputprofiles/Keyboard (No Numpad).ini b/data/inputprofiles/Keyboard (No Numpad).ini
index b095c9618..a70a4875f 100644
--- a/data/inputprofiles/Keyboard (No Numpad).ini	
+++ b/data/inputprofiles/Keyboard (No Numpad).ini	
@@ -14,4 +14,3 @@ ButtonL1 = Keyboard/Q
 ButtonL2 = Keyboard/1
 ButtonR1 = Keyboard/E
 ButtonR2 = Keyboard/3
-Rumble = Controller0
diff --git a/data/inputprofiles/Keyboard.ini b/data/inputprofiles/Keyboard.ini
index 04ae26197..81c49bc94 100644
--- a/data/inputprofiles/Keyboard.ini
+++ b/data/inputprofiles/Keyboard.ini
@@ -14,4 +14,3 @@ ButtonL1 = Keyboard/Q
 ButtonL2 = Keyboard/1
 ButtonR1 = Keyboard/E
 ButtonR2 = Keyboard/3
-Rumble = Controller0
diff --git a/src/frontend-common/common_host_interface.cpp b/src/frontend-common/common_host_interface.cpp
index 0765e9bb8..aa458a4c3 100644
--- a/src/frontend-common/common_host_interface.cpp
+++ b/src/frontend-common/common_host_interface.cpp
@@ -1846,9 +1846,12 @@ void CommonHostInterface::ApplyInputProfile(const char* profile_path, SettingsIn
     }
 
     si.DeleteValue(section_name, "Rumble");
-    const std::string rumble_value = profile.GetStringValue(section_name, "Rumble");
-    if (!rumble_value.empty())
-      si.SetStringValue(section_name, "Rumble", rumble_value.c_str());
+    if (Controller::GetVibrationMotorCount(*ctype) > 0)
+    {
+      const std::string rumble_value = profile.GetStringValue(section_name, "Rumble");
+      if (!rumble_value.empty())
+        si.SetStringValue(section_name, "Rumble", rumble_value.c_str());
+    }
 
     Controller::SettingList settings = Controller::GetSettings(*ctype);
     for (const SettingInfo& ssi : settings)
@@ -1903,9 +1906,12 @@ bool CommonHostInterface::SaveInputProfile(const char* profile_path, SettingsInt
         profile.AddToStringList(section_name, key_name, binding.c_str());
     }
 
-    const std::string rumble_value = si.GetStringValue(section_name, "Rumble");
-    if (!rumble_value.empty())
-      profile.SetStringValue(section_name, "Rumble", rumble_value.c_str());
+    if (Controller::GetVibrationMotorCount(ctype) > 0)
+    {
+      const std::string rumble_value = si.GetStringValue(section_name, "Rumble");
+      if (!rumble_value.empty())
+        profile.SetStringValue(section_name, "Rumble", rumble_value.c_str());
+    }
 
     Controller::SettingList settings = Controller::GetSettings(ctype);
     for (const SettingInfo& ssi : settings)