diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7e94b4b9..28b6c4aa 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -42,6 +42,8 @@
             android:enabled="true" >
         </service>
 
+<!--Commented here and in PluginFactory until we release a desktop version with this feature, so we don't get bad "feature not working" reviews-->
+<!--
         <service android:name="org.kde.kdeconnect.Plugins.RemoteKeyboardPlugin.RemoteKeyboardService"
             android:label="KDE Connect Remote Keyboard"
             android:permission="android.permission.BIND_INPUT_METHOD">
@@ -50,7 +52,7 @@
             </intent-filter>
             <meta-data android:name="android.view.im" android:resource="@xml/remotekeyboardplugin_method" />
         </service>
-
+-->
         <activity
             android:name="org.kde.kdeconnect.UserInterface.MaterialActivity"
             android:label="KDE Connect"
diff --git a/src/org/kde/kdeconnect/Plugins/PluginFactory.java b/src/org/kde/kdeconnect/Plugins/PluginFactory.java
index b514634a..826a5857 100644
--- a/src/org/kde/kdeconnect/Plugins/PluginFactory.java
+++ b/src/org/kde/kdeconnect/Plugins/PluginFactory.java
@@ -125,7 +125,8 @@ public class PluginFactory {
         PluginFactory.registerPlugin(TelepathyPlugin.class);
         PluginFactory.registerPlugin(FindMyPhonePlugin.class);
         PluginFactory.registerPlugin(RunCommandPlugin.class);
-        PluginFactory.registerPlugin(RemoteKeyboardPlugin.class);
+        //Commented here and in AndroidManifest until we release a desktop version with this feature, so we don't get bad "feature not working" reviews
+        //PluginFactory.registerPlugin(RemoteKeyboardPlugin.class);
     }
 
     public static PluginInfo getPluginInfo(Context context, String pluginKey) {