diff --git a/src/kekengine/cpp/common/defaults.cpp b/src/kekengine/cpp/common/defaults.cpp
index 7ffc0ea..12fc3e8 100644
--- a/src/kekengine/cpp/common/defaults.cpp
+++ b/src/kekengine/cpp/common/defaults.cpp
@@ -47,6 +47,11 @@ static void defaultKeyCallback(GLFWwindow *window, int key, int scancode, int ac
 	if(key == Input::getKeyBinding(keyToggleNoclip).key && action == GLFW_PRESS) {
 		kekData.player->noclip = !kekData.player->noclip;
 		kekData.player->controller = kekData.player->noclip ? (PlayerController *) noclipController : (PlayerController *) defaultController;
+		if(kekData.player->noclip) {
+			kekData.physics->world->removeRigidBody(kekData.player->physics->body);
+		}else {
+			kekData.physics->world->addRigidBody(kekData.player->physics->body);
+		}
 	}
 }