diff --git a/lib/private/app.php b/lib/private/app.php
index d5e07ffdbccde4ae96b87422caed2343266f2efb..e45d9ac07bab8775870b5c7142a122679ff03429 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -1174,6 +1174,8 @@ class OC_App {
 		$appData = self::getAppInfo($appId);
 		if (array_key_exists('ocsid', $appData)) {
 			OC_Appconfig::setValue($appId, 'ocsid', $appData['ocsid']);
+		} elseif(OC_Appconfig::getValue($appId, 'ocsid', null) !== null) {
+			OC_Appconfig::deleteKey($appId, 'ocsid');
 		}
 		foreach ($appData['remote'] as $name => $path) {
 			OCP\CONFIG::setAppValue('core', 'remote_' . $name, $appId . '/' . $path);