diff --git a/lib/util.php b/lib/util.php
index c5ef4e3b6f..4932be2d6c 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -519,6 +519,11 @@ class OC_Util {
 	 * Check if the setlocal call doesn't work. This can happen if the right local packages are not available on the server.
 	 */
 	public static function issetlocaleworking() {
+		// setlocale test is pointless on Windows
+		if (OC_Util::runningOnWindows() ) {
+			return true;
+		}
+
 		$result=setlocale(LC_ALL, 'en_US.UTF-8');
 		if($result==false) {
 			return(false);