diff --git a/extra/prometheus/Makefile b/extra/prometheus/Makefile
index 80efad1d5..940157c0a 100644
--- a/extra/prometheus/Makefile
+++ b/extra/prometheus/Makefile
@@ -40,10 +40,13 @@ ifdef EXPORTER
 endif
 
 uninstall:
-	-$(SYSTEMCTL) disable --now opencas_exporter
-	rm -f $(DESTDIR)/usr/bin/opencas_exporter
-	rm -f $(DESTDIR)$(SYSTEMD_DIR)/opencas_exporter.service
-	$(SYSTEMCTL) daemon-reload
+	@if [ -f $(DESTDIR)$(SYSTEMD_DIR)/opencas_exporter.service ]; then \
+		echo "Uninstalling Open-CAS Prometheus exporter"; \
+		$(SYSTEMCTL) disable --now opencas_exporter; \
+		rm -f $(DESTDIR)$(SYSTEMD_DIR)/opencas_exporter.service; \
+		$(SYSTEMCTL) daemon-reload; \
+	fi
+	@rm -f $(DESTDIR)/usr/bin/opencas_exporter
 
 clean:
 	rm -f opencas_exporter
diff --git a/utils/Makefile b/utils/Makefile
index f9957b9bd..9059183a0 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -96,8 +96,12 @@ uninstall:
 	$(call remove-file,$(DESTDIR)$(UDEVRULES_DIR)/60-persistent-storage-cas.rules)
 	@$(UDEV) control --reload-rules
 
-	@$(SYSTEMCTL) -q disable open-cas-shutdown
-	@$(SYSTEMCTL) -q disable open-cas
+	@if [ -f $(DESTDIR)$(SYSTEMD_DIR)/open-cas-shutdown.service ]; then \
+		$(SYSTEMCTL) -q disable open-cas-shutdown; \
+	fi
+	@if [ -f $(DESTDIR)$(SYSTEMD_DIR)/open-cas.service ]; then \
+		$(SYSTEMCTL) -q disable open-cas; \
+	fi
 	@$(SYSTEMCTL) daemon-reload
 
 	$(call remove-file,$(DESTDIR)$(SYSTEMD_DIR)/open-cas-shutdown.service)