diff --git a/sway/extensions.c b/sway/extensions.c
index 7769f86e0..1ca66468e 100644
--- a/sway/extensions.c
+++ b/sway/extensions.c
@@ -162,5 +162,5 @@ void register_extensions(void) {
 	desktop_shell.panel_position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM;
 	desktop_shell.lock_surfaces = create_list();
 	desktop_shell.is_locked = false;
-	wl_global_create(wlc_get_wl_display(), &lock_interface, 3, NULL, swaylock_bind);
+	wl_global_create(wlc_get_wl_display(), &lock_interface, 1, NULL, swaylock_bind);
 }
diff --git a/swaylock/main.c b/swaylock/main.c
index fbe2851bf..4073da99e 100644
--- a/swaylock/main.c
+++ b/swaylock/main.c
@@ -97,9 +97,9 @@ int main(int argc, char **argv) {
 	surfaces = create_list();
 	registry = registry_poll();
 
-	/*if (!registry->swaylock) {
+	if (!registry->swaylock) {
 		sway_abort("swaylock requires the compositor to support the swaylock extension.");
-	}*/
+	}
 
 	int i;
 	for (i = 0; i < registry->outputs->length; ++i) {
@@ -108,7 +108,7 @@ int main(int argc, char **argv) {
 		if (!window) {
 			sway_abort("Failed to create surfaces.");
 		}
-		//lock_set_lock_surface(registry->swaylock, output->output, window->surface);
+		lock_set_lock_surface(registry->swaylock, output->output, window->surface);
 		list_add(surfaces, window);
 	}