diff --git a/usr/bin/ublue-user-flatpak-manager b/usr/bin/ublue-user-flatpak-manager
index ed0320bb3cc..5eefe7de4ba 100755
--- a/usr/bin/ublue-user-flatpak-manager
+++ b/usr/bin/ublue-user-flatpak-manager
@@ -11,6 +11,12 @@ if [[ -f $VER_FILE && $VER = $VER_RAN ]]; then
   exit 0
 fi
 
+# Setup Flathub
+if grep -qz 'fedora' <<< $(flatpak remotes); then
+  flatpak remote-delete --user fedora --force
+fi
+flatpak remote-add --if-not-exists --user flathub /etc/flatpak/remotes.d/flathub.flatpakrepo
+
 # Lists of flatpaks
 FLATPAK_LIST=$(flatpak list --columns=application)
 INSTALL_LIST=$(cat /etc/flatpak/user/install)
diff --git a/usr/bin/ublue-user-setup b/usr/bin/ublue-user-setup
index d45b51aa46a..0da279fcbed 100755
--- a/usr/bin/ublue-user-setup
+++ b/usr/bin/ublue-user-setup
@@ -17,12 +17,6 @@ IMAGE_NAME=$(jq -r '."image-name"' < $IMAGE_INFO)
 # Enable NTP
 timedatectl set-ntp true
 
-# Setup Flathub
-if grep -qz 'fedora' <<< $(flatpak remotes); then
-  flatpak remote-delete --user fedora --force
-fi
-flatpak remote-add --if-not-exists --user flathub /etc/flatpak/remotes.d/flathub.flatpakrepo
-
 # Prevent future executions
 echo "Writing state file"
 echo $USER_SETUP_VER > $USER_SETUP_VER_FILE
diff --git a/usr/lib/systemd/user/ublue-user-flatpak-manager.service b/usr/lib/systemd/user/ublue-user-flatpak-manager.service
index 36319a6dcdf..1398e805ca0 100644
--- a/usr/lib/systemd/user/ublue-user-flatpak-manager.service
+++ b/usr/lib/systemd/user/ublue-user-flatpak-manager.service
@@ -2,7 +2,7 @@
 Description=Manage user flatpaks
 Documentation=https://github.com/ublue-os/endlish-oesque/issues/10
 Wants=network-online.target
-After=network-online.target ublue-user-setup.service
+After=network-online.target
 
 [Service]
 Type=oneshot