diff --git a/include/display.js b/include/display.js
index 201acf33..9a8e4559 100644
--- a/include/display.js
+++ b/include/display.js
@@ -88,7 +88,7 @@ var Display;
         // Determine browser support for setting the cursor via data URI scheme
         if (this._cursor_uri || this._cursor_uri === null ||
                 this._cursor_uri === undefined) {
-            this._cursor_uri = Util.browserSupportsCursorURIs(this._target);
+            this._cursor_uri = Util.browserSupportsCursorURIs();
         }
 
         Util.Debug("<< Display.constructor");
diff --git a/include/rfb.js b/include/rfb.js
index b9db39c4..a591ca2b 100644
--- a/include/rfb.js
+++ b/include/rfb.js
@@ -1265,6 +1265,7 @@ var RFB;
                 this._local_cursor = true;
             } else {
                 Util.Warn("Browser does not support local cursor");
+                this._display.disableLocalCursor();
             }
         }
     };