diff --git a/Machines/Commodore/Plus4/Video.hpp b/Machines/Commodore/Plus4/Video.hpp
index 5b70b659a..9db25c799 100644
--- a/Machines/Commodore/Plus4/Video.hpp
+++ b/Machines/Commodore/Plus4/Video.hpp
@@ -285,6 +285,8 @@ public:
 				output_state_ = state;
 				if(output_state_ == OutputState::Pixels) {
 					pixels_ = reinterpret_cast<uint16_t *>(crt_.begin_data(PixelAllocationSize));
+				} else {
+					pixels_ = nullptr;
 				}
 			}
 
@@ -394,8 +396,7 @@ public:
 				if(increment_character_position_ && character_fetch_) {
 					++character_position_;
 				}
-
-				if(state == OutputState::Pixels) {
+				if(enable_display_) {
 					switch(x_scroll_) {
 						case 0:	draw<0>();	break;
 						case 1:	draw<1>();	break;
diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme
index 2f418ee7d..47d733bb8 100644
--- a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme	
+++ b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme	
@@ -62,7 +62,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       enableASanStackUseAfterReturn = "YES"