diff --git a/src/lib/y2remote/modes/socket_based.rb b/src/lib/y2remote/modes/socket_based.rb
index 651a135e6..141a9ef6e 100644
--- a/src/lib/y2remote/modes/socket_based.rb
+++ b/src/lib/y2remote/modes/socket_based.rb
@@ -16,6 +16,11 @@ def socket_name
         raise "Not implemented yet"
       end
 
+      # Name of the associated service that will be started
+      def service_name
+        raise "Not implemented yet"
+      end
+
       # Obtain the systemd socket itself
       #
       # @return [Yast::SystemdSocket, nil]
@@ -82,6 +87,10 @@ def stop!
           return false
         end
 
+        if !Yast::Service.Stop(service_name)
+          Yast::Report.Error(Yast::Message.CannotStopService(service_name))
+        end
+
         true
       end
 
diff --git a/src/lib/y2remote/modes/vnc.rb b/src/lib/y2remote/modes/vnc.rb
index 209a937af..11a2130ae 100644
--- a/src/lib/y2remote/modes/vnc.rb
+++ b/src/lib/y2remote/modes/vnc.rb
@@ -20,6 +20,10 @@ def required_packages
       def socket_name
         SOCKET
       end
+
+      def service_name
+        "#{socket_name}@*"
+      end
     end
   end
 end
diff --git a/src/lib/y2remote/modes/web.rb b/src/lib/y2remote/modes/web.rb
index 1af164cf4..6bfc36051 100644
--- a/src/lib/y2remote/modes/web.rb
+++ b/src/lib/y2remote/modes/web.rb
@@ -25,6 +25,13 @@ def required_packages
       def socket_name
         SOCKET
       end
+
+      # Name of the associated service
+      #
+      # @return [String] service name
+      def service_name
+        socket_name
+      end
     end
   end
 end