diff --git a/src/freedombone-app-wiki b/src/freedombone-app-wiki
index f15ce31f..5dd67e5b 100755
--- a/src/freedombone-app-wiki
+++ b/src/freedombone-app-wiki
@@ -54,10 +54,52 @@ function backup_local_wiki {
 	fi
 }
 
+function restore_local_wiki {
+	if [ -d /var/lib/dokuwiki ]; then
+		echo $"Restoring Wiki installation"
+		WIKI_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Wiki domain" | awk -F ':' '{print $2}')
+		temp_restore_dir=/root/tempwiki
+		function_check restore_directory_from_usb
+		restore_directory_from_usb $temp_restore_dir wiki
+		cp -r $temp_restore_dir/var/lib/dokuwiki/* /var/lib/dokuwiki/
+		if [ ! "$?" = "0" ]; then
+			function_check restore_directory_from_usb
+			set_user_permissions
+			function_check backup_unmount_drive
+			backup_unmount_drive
+			exit 868
+		fi
+		restore_directory_from_usb ${temp_restore_dir}2 wiki2
+		cp -r ${temp_restore_dir}2/etc/dokuwiki/* /etc/dokuwiki/
+		if [ ! "$?" = "0" ]; then
+			function_check set_user_permissions
+			set_user_permissions
+			function_check backup_unmount_drive
+			backup_unmount_drive
+			exit 869
+		fi
+		rm -rf $temp_restore_dir
+		rm -rf ${temp_restore_dir}2
+		chown -R www-data:www-data /var/lib/dokuwiki/*
+		# Ensure that the bundled SSL cert is being used
+		if [ -f /etc/ssl/certs/${WIKI_DOMAIN_NAME}.bundle.crt ]; then
+			sed -i "s|${WIKI_DOMAIN_NAME}.crt|${WIKI_DOMAIN_NAME}.bundle.crt|g" /etc/nginx/sites-available/${WIKI_DOMAIN_NAME}
+		fi
+		if [ -d /etc/letsencrypt/live/${WIKI_DOMAIN_NAME} ]; then
+			ln -s /etc/letsencrypt/live/${WIKI_DOMAIN_NAME}/privkey.pem /etc/ssl/private/${WIKI_DOMAIN_NAME}.key
+			ln -s /etc/letsencrypt/live/${WIKI_DOMAIN_NAME}/fullchain.pem /etc/ssl/certs/${WIKI_DOMAIN_NAME}.pem
+		fi
+	fi
+}
+
 function backup_remote_wiki {
 	echo -n ''
 }
 
+function restore_remote_wiki {
+	echo -n ''
+}
+
 function remove_wiki {
 	if ! grep -Fxq "install_wiki" $COMPLETION_FILE; then
 		return
diff --git a/src/freedombone-restore-local b/src/freedombone-restore-local
index 79f83748..4e8b5b35 100755
--- a/src/freedombone-restore-local
+++ b/src/freedombone-restore-local
@@ -1034,42 +1034,6 @@ function restore_gogs {
     fi
 }
 
-function restore_wiki {
-    if [[ $RESTORE_APP != 'all' ]]; then
-        if [[ $RESTORE_APP != 'wiki' ]]; then
-            return
-        fi
-    fi
-    if [ $WIKI_DOMAIN_NAME ]; then
-        echo $"Restoring Wiki installation ${WIKI_DOMAIN_NAME}"
-        restore_directory_from_usb /root/tempwiki wiki
-        cp -r /root/tempwiki/var/lib/dokuwiki/* /var/lib/dokuwiki/
-        if [ ! "$?" = "0" ]; then
-            set_user_permissions
-            backup_unmount_drive
-            exit 868
-        fi
-        restore_directory_from_usb /root/tempwiki2 wiki2
-        cp -r /root/tempwiki2/etc/dokuwiki/* /etc/dokuwiki/
-        if [ ! "$?" = "0" ]; then
-            set_user_permissions
-            backup_unmount_drive
-            exit 869
-        fi
-        rm -rf /root/tempwiki
-        rm -rf /root/tempwiki2
-        chown -R www-data:www-data /var/lib/dokuwiki/*
-        # Ensure that the bundled SSL cert is being used
-        if [ -f /etc/ssl/certs/${WIKI_DOMAIN_NAME}.bundle.crt ]; then
-            sed -i "s|${WIKI_DOMAIN_NAME}.crt|${WIKI_DOMAIN_NAME}.bundle.crt|g" /etc/nginx/sites-available/${WIKI_DOMAIN_NAME}
-        fi
-        if [ -d /etc/letsencrypt/live/${WIKI_DOMAIN_NAME} ]; then
-            ln -s /etc/letsencrypt/live/${WIKI_DOMAIN_NAME}/privkey.pem /etc/ssl/private/${WIKI_DOMAIN_NAME}.key
-            ln -s /etc/letsencrypt/live/${WIKI_DOMAIN_NAME}/fullchain.pem /etc/ssl/certs/${WIKI_DOMAIN_NAME}.pem
-        fi
-    fi
-}
-
 function restore_email {
     if [[ $RESTORE_APP != 'all' ]]; then
         if [[ $RESTORE_APP != 'email' ]]; then
@@ -1165,7 +1129,6 @@ restore_rss
 restore_syncthing
 restore_mediagoblin
 restore_gogs
-restore_wiki
 
 restore_email
 restore_apps