diff --git a/data/etc/plinth/modules-enabled/diaspora b/data/etc/plinth/modules-enabled/diaspora
deleted file mode 100644
index 1ae682dfd..000000000
--- a/data/etc/plinth/modules-enabled/diaspora
+++ /dev/null
@@ -1,2 +0,0 @@
-plinth.modules.diaspora
-
diff --git a/setup.py b/setup.py
index 98829355f..fc06637ba 100755
--- a/setup.py
+++ b/setup.py
@@ -52,9 +52,10 @@ ENABLED_APPS_PATH = "/etc/plinth/modules-enabled/"
 
 DISABLED_APPS_TO_REMOVE = [
     'apps',
+    'diaspora',
+    'owncloud',
     'system',
     'xmpp',
-    'owncloud'
 ]
 
 LOCALE_PATHS = [