diff --git a/lib/setup.php b/lib/setup.php
index d80408de98..fa0b8f8590 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -116,6 +116,8 @@ class OC_SETUP {
 				}
 			}
 			else {
+				//delete the old sqlite database first, might cause infinte loops otherwise
+				unlink("$datadir/owncloud.db");
 				//in case of sqlite, we can always fill the database
 				OC_DB::createDbFromStructure('db_structure.xml');
 			}