diff --git a/MonoGame.Framework/GraphicsDeviceManager.cs b/MonoGame.Framework/GraphicsDeviceManager.cs
index 062a8b22245..5e049056b7a 100644
--- a/MonoGame.Framework/GraphicsDeviceManager.cs
+++ b/MonoGame.Framework/GraphicsDeviceManager.cs
@@ -293,6 +293,10 @@ private void PrepareGraphicsDeviceInformation(GraphicsDeviceInformation gdi)
         /// </summary>
         public void ApplyChanges()
         {
+#if WINDOWS_UAP || (W81 || WP81)
+            if (_graphicsDevice == null)
+                return;
+#endif
             // If the device hasn't been created then create it now.
             if (_graphicsDevice == null)
                 CreateDevice();